Merge remote branch 'origin/upstream-cvs' into upstream
authorBernd Zeimetz <bernd@bzed.de>
Thu, 22 Apr 2010 15:47:55 +0000 (17:47 +0200)
committerBernd Zeimetz <bernd@bzed.de>
Thu, 22 Apr 2010 15:47:55 +0000 (17:47 +0200)

Trivial merge